Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 22 Jun 2010 00:22:23 +0000 (00:22 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 22 Jun 2010 00:22:23 +0000 (00:22 +0000)

Trivial merge